Fix some errors in the handling of drop columns. (#143355, John Finlay)

2005-05-18  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_get_drop_column)
	(gtk_tree_view_set_column_drag_info): Fix some errors in the
	handling of drop columns.  (#143355, John Finlay)

diff --git a/ChangeLog b/ChangeLog
index 7f8e6b38b261799440931f93130efafa0bd22137..efc0337b417ea0e79b69774eb5084a01bfce90b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_get_drop_column) 
+       (gtk_tree_view_set_column_drag_info): Fix some errors in the
+       handling of drop columns.  (#143355, John Finlay)
+
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): 
        Remove the no longer needed workaround.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7f8e6b38b261799440931f93130efafa0bd22137..efc0337b417ea0e79b69774eb5084a01bfce90b8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_get_drop_column) 
+       (gtk_tree_view_set_column_drag_info): Fix some errors in the
+       handling of drop columns.  (#143355, John Finlay)
+
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): 
        Remove the no longer needed workaround.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7f8e6b38b261799440931f93130efafa0bd22137..efc0337b417ea0e79b69774eb5084a01bfce90b8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_get_drop_column) 
+       (gtk_tree_view_set_column_drag_info): Fix some errors in the
+       handling of drop columns.  (#143355, John Finlay)
+
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): 
        Remove the no longer needed workaround.
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 602077053a12d2df86094d8757725d37f8b71293..bbc955cb4068f137630b1988e8a6059ee5dc67e1 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4018,7 +4018,7 @@ gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
                continue;
              }
 
-           return cur_column;
+           return left_column;
          }
 
        if (!tree_view->priv->column_drop_func)
@@ -4069,7 +4069,7 @@ gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
                continue;
              }
 
-           return cur_column;
+           return left_column;
          }
 
        if (!tree_view->priv->column_drop_func)
@@ -8054,7 +8054,7 @@ gtk_tree_view_set_column_drag_info (GtkTreeView       *tree_view,
   /* Add the last one */
   if (tree_view->priv->column_drop_func == NULL ||
       ((left_column != column) &&
-       (* tree_view->priv->column_drop_func) (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data)))
+       (* tree_view->priv->column_drop_func) (tree_view, column, left_column, NULL, tree_view->priv->column_drop_func_data)))
     {
       reorder = g_new (GtkTreeViewColumnReorder, 1);
       reorder->left_column = left_column;